I wouldn’t really agree with incremental migrations being rotten. Having a set of homegrown scripts would, in my opinion, be a worse approach than having a real tool for such a job will make tracking those changes easier. I’ve had to deal with a similar situation myself, before, so hopefully I can share some of … Read more
ours and theirs is a somewhat confusing concept; exacerbated when performing a rebase: When performing a merge, ours refers to the branch you’re merging into, and theirs refers to the branch you are merging from. So if you are trying to resolve conflicts in the middle of a merge: use ours to accept changes from … Read more
I am not sure about what you mean by “branch structure”. git log can help visualize the branches made through commits (See this blog post): [alias] lg = log –graph –pretty=format:’%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset’ –abbrev-commit –date=relative git config –global alias.lg “log –graph –pretty=format:’%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset’ –abbrev-commit –date=relative” But if you … Read more
You can use for-each-ref: git for-each-ref –format=”%(refname:short)” refs/heads/
You can give this a try: git log –graph –all –decorate –simplify-by-decoration It will only show commits that are branch heads or tagged.
By default git will see each difference in a line’s indentation as a change, so yes you’re likely to end up with mass conflicts doing a stock merge. However you can choose the merge strategy to use with the -s option: git merge -s recursive -Xignore-space-change This command would use the recursive strategy and uses … Read more
This error message: error: remote unpack failed: unable to create temporary object directory indicates that the Git repository at the server (not your Git) is out of space, or running into similar server problems,1 or installed incorrectly. That is, given: To: http://git.int.censoredlink/scm/freeb/freebrep.git you will have to log in to the machine that serves HTTP traffic … Read more
Answering just the question in the subject line, without addressing anything about git show-branch (like ElpieKay, I never actually use git show-branch; it seems mainly mis-informative): Git branch names—and tag names, and all other reference names, as Git calls them—were originally intended to be case-sensitive. This all works perfectly on Linux / Unix machines, where … Read more
Use the git diff branch branch filename syntax: git diff branchA branchB — file.cs put the two names of your branches and optionally use the — filename option to specify one file! Good luck, let me know if you have issues.
Checkout a different branch first, before deleting it: git checkout master git branch -d MyMods Also, branches have nothing to do with folders. Git always tracks the whole repository at once, with all its folders and files. A branch is nothing else than a pointer to a single commit, or snapshot, in the history of … Read more