* b1a68b9 fixed merge conflicts
|\
| * 4a09c3c ticketing and questions working
| * 49a3113 questions progress1
| * 414b5d2 ticketing fixes - editing works
| * b39c2d1 added ticketing
| * 6decbb7 general ui fixex
| * 88176fc fixed model
| * 487ecd7 fixed references and updated to EF6
* | 53a9da3
That makes sense. I was trying the do until works strategy. Thanks for
your help.
On Saturday, 7 December 2013 14:59:03 UTC+11, Huu Da Tran wrote:
On Friday, December 6, 2013 10:48:29 PM UTC-5, Phillip Tutt wrote:
For sure. This is where I was fumbling to try to get it all working:
Yeah...you are right...what is 53a9da3??? Ok, that came from another branch
I merged in, but it looks like it didn't find it's way to the remote. I
was pretty certain I did a push from the desktop to the remote after that,
but I can't be 100% sure. I am guessing git is more likely to be more
On Dec 6, 2013 7:32 PM, Phillip Tutt phil.t...@gmail.com wrote:
This is the bit that doesn't make sense:
1. Remote last log entry:
2013-11-04
Phil
ticketing and questions working
admintemplate
4a09c3
2. Desktop last log entries, note, the last commit was after I had to fix
the merge
Yes it does. That commit is just prior to commencing work on the laptop.
What Huu said about using git clone instead of git init/pull on the laptop
sounds like it could have caused the issue. I will need to reset to the
last commit on the laptop.
Thanks
On Saturday, 7 December 2013
On Dec 7, 2013 11:32 AM, Phillip Tutt phil.t...@gmail.com wrote:
Yes it does. That commit is just prior to commencing work on the laptop.
What Huu said about using git clone instead of git init/pull on the laptop
sounds like it could have caused the issue. I will need to reset to the
last
On Thursday, December 5, 2013 7:08:14 AM UTC-5, Phillip Tutt wrote:
What I would expect is the code now on the desktop would be the same as
what was on the laptop...however, I found that some kind of merge was
happening and conflicts, but shouldn't it just be a fast forward?
Note, I did not
From what you've said your assumption is correct, it should just be a
fast-forward pull/merge on the desktop at the end. Is there any chance you
could provide the Git commands you're using at each stage? It might also be
useful to know how you set up the repositories in the first place.
This is the bit that doesn't make sense:
1. Remote last log entry: 2013-11-04Philticketing and questions
workinghttps://git.eventgate.com.au:9443/commit/eventgate.git/4a09c3c9093b53989e4fff5cc392299364315402
Please compare the log from laptop and desktop.
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options,
For sure. This is where I was fumbling to try to get it all working:
1. I set up a repository on the desktop, with the Git init here context
menu on the folder
2. I add code and commited:
git add . --all
git commit -m some comment
3. On thing to note is I don't have a master
Sorry...here's the log from the laptop. However, it has a couple of
commits that have not been pushed to the remote yet:
commit c21b88e665603310b74b8f3c80f23782ebb4d562
Author: Phil x...@gmail.com
Date: Tue Nov 19 20:17:18 2013 +0800
payment progress
commit
On Friday, December 6, 2013 10:48:29 PM UTC-5, Phillip Tutt wrote:
For sure. This is where I was fumbling to try to get it all working:
1. I set up a repository on the desktop, with the Git init here context
menu on the folder
2. I add code and commited:
git add . --all
git commit
13 matches
Mail list logo
