Re: [git-users] How should I use Git when I have two computers with different files?

2014-08-16 Thread Gergely Polonkai
On 15 August 2014 21:41, Suh-Shin hwang wrote: > -- > 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

Re: [git-users] How should I use Git when I have two computers with different files?

2014-08-15 Thread Suh-Shin hwang
Hi Gergely, 1. I have modifications on A and I did not use Git of any kind when I copied the file to computer B. I simply copied the files from A into a USB stick to B, created a repo on B, did some modifications then pushed to BitBucket. 2. Everything is on master right now. -- You received

Re: [git-users] How should I use Git when I have two computers with different files?

2014-08-15 Thread Gergely Polonkai
The information you gave is a bit loosy. Do you have modifications on A, or everything in A is pushed to BitBucket? How did you copy your repository from A to B? Did you just copy the directory, or used git clone to create a second one? Are you using branches, or everything you do is on master?

[git-users] How should I use Git when I have two computers with different files?

2014-08-15 Thread Suh-Shin hwang
Hi all, I copied a project from computer A to computer B using a USB stick. I modified some parts of the project in computer B and now I want to reflect this change in computer A. I'm using BitBucket for the server. How might I use Git in this situation? Do I create a new repository in computer