I am still a beginner of GIT and have the basic questions below.
1. Git over HTTP using Apache Web Server
I suppose that Git can be configured with Apache Web Server
and the committed file information on a remote repository
can be retrieved by HTTP protocol.
If it is possible, I want to know the
It seems to me the merge caused by your initial checkout has conflicts, and
so was not commited (git status to confirm).
If your objective is to cancel the merge, you can git merge --abort, but
I'm not sure what will become of the index changes you had before the
checkout -m.
J.
Le mercredi 27
On 2016-07-27, at 5:44 AM, Jerome Fouletier wrote:
> It seems to me the merge caused by your initial checkout has conflicts, and
> so was not commited (git status to confirm).
> If your objective is to cancel the merge, you can git merge --abort, but I'm
> not sure what will become of the inde
What am I doing wrong here? I'm trying to work with something from a remote.
keybounceMBP:Finite-Fluids michael$ git fetch origin Readme-File
>From https://github.com/keybounce/Finite-Fluids
* branchReadme-File -> FETCH_HEAD
keybounceMBP:Finite-Fluids michael$ git status
On branch dev
Jerome Fouletier writes:
> I have one branch BR1 which receives frequent merges from branch BR0.
> Branch BR1 is tagged once per sprint, and I need to list the commits that
> have been made or merged since the last tag:
>
>
>-A1---B1(TAG)--C1---D1---E1---F1---G1(BR1)
>
>/
