 |
Post Aj63fo3R2iTwfH0M76 by [email protected] |
 |
More posts by [email protected] |
|
Post #Aj63OsGw6lOEp5FJNg by [email protected] |
|
0 likes, 1 repeats |
|
|
|
merge conflict tips(this is #bonuscomic #5 for "How Git Works" https:… |
|
|
|
Post #Aj63OsNfhimH9yOgsa by [email protected] |
|
0 likes, 1 repeats |
|
|
|
@b0rk also, instead of "the web", you know, "git show trunk:file… |
|
|
|
Post #Aj63fo3R2iTwfH0M76 by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@b0rk the "merge one at a time" can be done semi automatically with g… |
|
|
|
Post #Aj63frxCXps8l67Qx6 by [email protected] |
|
0 likes, 2 repeats |
|
|
|
@DerPumu @b0rk Looks unmaintained now sadly, but +1, it can be very useful in s… |
|
|
|
Post #Aj64HFK0ctpxwnbrgO by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@nabijaczleweli haha thank you I knew there was a syntax for that but I just co… |
|
|
|
Post #Aj64HFQ2GUeqFUQg4m by [email protected] |
|
0 likes, 1 repeats |
|
|
|
@b0rk yes, this is not to be confused with "git show trunk file.txt" … |
|
|
|
Post #Aj659mra8Uchc0Juue by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@nabijaczleweli @b0rk i had to stare pretty hard at the git grep man page but y… |
|
|
|
Post #Aj659mxbm5RZuh8jJ2 by [email protected] |
|
0 likes, 1 repeats |
|
|
|
@leftpaddotpy @b0rk git grep accepts these and probably 3 other calling convent… |
|
|
|
Post #Aj65ipLosXNJSlAjaq by [email protected] |
|
0 likes, 1 repeats |
|
|
|
@leftpaddotpy @b0rk you know its good when when you post a git grep patch the m… |
|
|
|
Post #Aj6CzhOsOLb7PFatLU by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@greg0ire @b0rk I’ve used plain rebase as an alternative to git-imerge that I… |
|
|
|
Post #Aj6CzhVxxzGjlEuYOe by [email protected] |
|
0 likes, 2 repeats |
|
|
|
@hypolite @b0rk So you rebase, then use the resulting tree to resolve the merge? |
|
|
|
Post #Aj6twkHFXDNLUOrfpg by [email protected] |
|
0 likes, 0 repeats |
|
|
|
@greg0ire @b0rk I'm not sure I understand your question, but it probably co… |
|
|
|
Post #Aj6twkMvC7udlzWCfo by [email protected] |
|
0 likes, 1 repeats |
|
|
|
@hypolite @b0rk Oh OK... my use case is merging public patch or minor branches … |
