HI all
I honestly tried to find answers in various docs/books about git and failed, so I have to ask here.
1) Is it possible to achieve the same result with git fetch, as I have with git push. I have cloned a bare repository (2) from my repository (1) and
I want fetch made in (2) get all info contained in (1) . I talk only about 'master' here. git push from (1) to (2) does the job, but git fetch in (1) updates only origin/master, and not master.
I also found that there is a notions of current branch in bare repository (master in my case), that stops my experiments of deleting master and making new master out of origin/master.
How can I change current branch in bare repositry?
2) I read that git rebase used 'git am' internally. How can force git am/apply to create conflicts like rebase does in form
<<<<<<old
dksjfd
========