git-branch

I have two Git repos, foo/master and bar/master: In foo: code_root ->dirA ->dirB -> *some files* In bar: code_root -> *same files as above* Now someone has made changes to *some files* ... how do I get those changes merged into *same files as above* ? When I say "merged" I mean I need the history (commit messages, log hashes etc.) of the deltas to come over as well. You can split the changes out to the subtree level, and then merge with your other branch: # from your foo project git subtree split --prefix=dirA/dirB/ --branch=temp-branch [--onto=<onto-sub-note1>] [<commit-sub-note2>] onto sub

I'm new to Git. I search a lot but nothing found that exactly matches my case. I have a personal WinForms application and in my remote repo there are 3 branches (master and 2 long running branches): master #the common features are here like Core, DAL,... north #customized for A company (long-running) razavi #customized for B company (long-running) At my office PC, I add 2 worktree for those north and razavi branches: $ git worktree list C:/Source/nis a6fb6e1 [master] C:/Source/north ebc7670 [north] C:/Source/razavi eed08a2 [razavi] Everything is OK so far, I decide to work on this project from

This question already has answers here : Error when “git push” to github (5 answers) Possible Duplicate: Error when “git push” to github I tried to push my new branch (let's just call it new_branch ) to remote rep. There is no such branch there yet, but git push origin new_branch:new_branch should create it. When I try to do it, this is what I get: error: src refspec new_branch does not match any. error: failed to push some refs to 'ssh://git@***' I dug through million of questions like this on SO, but none of them specified these two errors at once and they referred only to master branch (I

This question already has an answer here: Move existing, uncommitted work to a new branch in Git 8 answers I eagerly ducked into code mode and modified some files, but neglected to branch from master first. The mods aren't so extensive that I can't redo them, but what's a good way of taking my (so far, uncommitted) changes in master and migrating them to a new branch, leaving master untouched in the end? If not yet committed anywhere ( git status shows a bunch of stuff modified, it's OK if it's "git add"-ed too): $ git checkout -b newbranch Despite the name checkout this usage (with -b ) does

Basic question but this happens to me all the time: Make changes in a working-branch Switch to master git merge working-branch git push cap deploy (to staging) make a new cup of tea then I come back and think of something else and start making some changes...while still on master. What's an easy way to either: prevent direct edits on master (warning perhaps) to move all edits over to working-branch and clear master so I can continue editing on working-branch to spin edits into an entirely new branch new-working-branch and then discard working-branch ? Took a risk and tried recommendation in