Update README to suggest running a git fetch and branch cleanup #57
Conversation
| #+begin_comment | ||
| Yes #uselessuseofcat but it is clearer than < > ! # $) &&*!&♨±⌘︎ to newbies. | ||
| #+end_comment | ||
|
|
||
| You are also recommended to fetch all git remotes in new repository to update your local state. |
There was a problem hiding this comment.
I don't think I understand this part--the script just did a full fetch, there should be no new changes incoming after running the script. After a while, yes, but not after you just merged. Does this actually change something for you?
There was a problem hiding this comment.
See
Line 64 in 4ca8975
There was a problem hiding this comment.
Thinking about it I am also confused why this step seems to be required. It should have fetched all the objects for the origins as part of the merging process and in theory should be up to date. As part of my personal testing the origins have not actually changed during the merge process either. I can however confirm it is the most likely cause of issues such as #21. My best guess is that the git repo thinks it is out of sync with the remotes.
There was a problem hiding this comment.
It also seems to be specific to using remote repositories, if you use full git paths instead of local paths you can replicate the issues trying to rebase merged branches. I believe it should be easy to replicate but I can attempt to make some reproduction steps as well.
Your repos list has to use the full git urls such as the usage example. It seems like there are subtle differences in behavior between what happens when you use the full url vs merge local repositories such as your test scripts.
$ cat my-repos.txt
[email protected]:mycompany/my-repo-abc.git abc
[email protected]:mycompany/my-repo-def.git def
[email protected]:mycompany/my-lib-uuu.git uuu lib/uuu
[email protected]:mycompany/my-lib-zzz.git zzz lib/zzz
https://gitee.com/shijie/zhongguo.git 中国
This pr is an attempt to document the post merge work / branch cleanup. I made my best attempt to write valid documentation, I am not personally setup to run emacs on my computer. I attempted to use documentation and examples of formatting in the README now to try to get it as right as possible. This is a bit of a rough draft as I made have missed some important information.
Closes #55