Ini adalah transkrip saya dari mencoba menggabungkan cabang perbaikan bug saya ke cabang master saya dalam persiapan untuk mendorongnya ke atas. Ada beberapa perubahan upstream yang ditarik ke master sejak cabang perbaikan bug dibuat, dan sekarang menolak untuk melakukan rebase.
File yang dilontarkannya kesalahan tidak berbeda saat dibuka. tidak ada file yang ditambahkan, dihapus atau diganti namanya. Tidak ada yang diabaikan dan tidak ada yang tidak terlacak atau dipentaskan atau tidak dipentaskan. Saya benar-benar bingung mengapa rebase gagal.
Saya menggunakan OS X 10.6.6 dan git 1.7.4
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase bug586-test master-test
First, rewinding head to replay your work on top of it...
Applying: - comiitting code related to api permissions
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
inc/data.inc
templates/apipermissions_tpl.inc
templates/currencies_tpl.inc
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 - comiitting code related to api permissions
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git status
# Not currently on any branch.
nothing to commit (working directory clean)
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase --abort
HEAD is now at 5efccf1 - comiitting code related to api permissions
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git log -n10 --oneline
5efccf1 - comiitting code related to api permissions
a8a5ee4 Style changes for IE
cfca618 Style changes for IE
8a69de6 Style changes for IE
8946585 - comiitting code related to api permissions - fixed an html error in the currencies template
5fba0a9 Merges the 1.11b branch bugfixes and changes into trunk
ef57049 Andrew Commiting on Blakes behalf on changes he made to transfers; Also an Indue GW balance fix; debitcarupload fix for LSN
69e4313 Fixed an issue with Support From email
9058fb6 Sets the svn property svn:eol-style to LF, to enforce unix style line endings
240839e Fixes up a lot of the whitespace issues.
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git checkout bug586-test
Switched to branch 'bug586-test'
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git log -n10 --oneline
b7b1f8a Resolves #586, Postback on deposit
5fba0a9 Merges the 1.11b branch bugfixes and changes into trunk
ef57049 Andrew Commiting on Blakes behalf on changes he made to transfers; Also an Indue GW balance fix; debitcarupload fix for LSN
69e4313 Fixed an issue with Support From email
9058fb6 Sets the svn property svn:eol-style to LF, to enforce unix style line endings
240839e Fixes up a lot of the whitespace issues.
cf27b6f - bug that came up with transferring. The transfer page had a hidden field called to, which was taking precedence over cards and usercard which would throw the system out a bit
7c21a81 Fixes #603, new add transaction form, journalled.
01e6292 Removes a pile of resource forks
880c5bc - bug that came up with transferring. The transfer page had a hidden field called to, which was taking precedence over cards and usercard which would throw the system out a bit
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase master-test bug586-test
First, rewinding head to replay your work on top of it...
Applying: Resolves #586, Postback on deposit
Using index info to reconstruct a base tree...
<stdin>:52: trailing whitespace.
'name' => 'Invoice Transfer Out',
<stdin>:175: trailing whitespace.
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
templates/deposit_tpl.inc
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0001 Resolves #586, Postback on deposit
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
.-(/Volumes/joshua/www/txfunds)-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------(joshua@Kusanagi)-
`--> git rebase --abort
HEAD is now at b7b1f8a Resolves #586, Postback on deposit
git
git-rebase
jhogendorn.dll
sumber
sumber
git statusyang mungkin bisa membantu adalah ketika rebase gagal. Ia menolak untuk berlari dengan pohon yang kotor; kami tahu itu bersih sebelum Anda mulai. Ini status ketika ada yang modifikasi lokal yang menyebabkan masalah.Jawaban:
Ini adalah jawaban yang sama dengan pertanyaan saya yang lain tentang masalah.
Saya menggunakan mac, dan perubahan konfigurasi yang tidak jelas ini sepertinya memperbaiki semua kesengsaraan saya terkait perubahan yang tidak dipentaskan ketika tidak ada.
Saya pikir ini berkaitan dengan perbedaan antara waktu file windows, waktu file linux dan waktu file mac. siapa tahu, silakan berkomentar jika Anda melakukannya.
Pembaruan: Entri blog ini menjelaskan apa yang terjadi, semacam.
sumber
Berkenaan dengan jawaban Joshua Hogendorn: menurut saya membiarkan Xcode terbuka saat mengerjakan repositori dengan git menyebabkan masalah ini. Itu bahkan menyebabkan situasi di mana git melakukan sesuatu yang saya pikir telah disembunyikan (dan masih ada setelahnya) tetapi Xcode hanya menulis ke sistem file tepat selama rebase.
Jadi: Tutup proyek Xcode Anda sebelum Anda mengerjakan repo dengan git jika Anda ingin aman, dan kemudian Anda mungkin tidak memerlukan pengaturan core.trustctime false.
sumber
webpack --watchberjalan.