Date: Thu, 26 Apr 2012 13:57:57 -0700 (PDT)
From: Daniel WEI <lak...@gmail.com>
To: bitbucket-users@googlegroups.com
Message-ID: <4843681.1726.1335473877861.JavaMail.geo-discussion-forums@ynbh26>
Subject: How to safely use git rebase or merge or branch after I have forked
 out a new repo? And what about version changed???
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_1724_19516728.1335473877860"

------=_Part_1724_19516728.1335473877860
Content-Type: multipart/alternative; 
	boundary="----=_Part_1725_23075373.1335473877860"

------=_Part_1725_23075373.1335473877860
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit



Completely newbie here, I am totally confused by these commands. Could 
anyone patiently elaborate and guide me though this. Thanks

I have forked a project, say it is a company's open project called OpenXXX. 
So now I am having my own online repo. This is good. And then I cloned to 
my local desktop. And then I add some features, some dirs, some files, do 
some modifications on the original files, and then add ., commit -am 
"blahblah" and push. And then I can see my changes on the online repo, this 
is good!

But when that company made some changes, I dont know them, they dont know 
me, so I guess I dont need "pull request", I just keep my development 
personal.

So what should I do when they made some changes? There are only a few, say 
10 percents of files conflicts, mostly I want to keep my modifications, and 
others I just want to sync with theirs. What should I do. I want to keep my 
OpenXXX project updated but I dont want to lose any of my own developments!!

Another question is: Is it a good habit, I mean do I need to start a new 
branch, and once a week merge it back to my own online repo's main branch, 
or what?

And another question is, when that company's OpenXXX, has a new version, 
and that version has a different git link address, OOPS, what should I do 
then? Does it mean that I need to create a new fork repo again, and 
manually find and export all my changes out and put them into the new 
forked repo??

Any help would be much appreciated. Thanks

(Could someone share his workflow in case of my situation? I want to be 
both safe and updated.)

------=_Part_1725_23075373.1335473877860
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable

<p style=3D"font-size: 14px; background-image: initial; background-attachme=
nt: initial; background-origin: initial; background-clip: initial; clear: b=
oth; word-wrap: break-word; color: rgb(0, 0, 0); font-family: Arial, 'Liber=
ation Sans', 'DejaVu Sans', sans-serif; text-align: left; ">Completely newb=
ie here, I am totally confused by these commands. Could anyone patiently el=
aborate and guide me though this. Thanks</p><p style=3D"font-size: 14px; ba=
ckground-image: initial; background-attachment: initial; background-origin:=
 initial; background-clip: initial; clear: both; word-wrap: break-word; col=
or: rgb(0, 0, 0); font-family: Arial, 'Liberation Sans', 'DejaVu Sans', san=
s-serif; text-align: left; ">I have forked a project, say it is a company's=
 open project called OpenXXX. So now I am having my own online repo. This i=
s good. And then I cloned to my local desktop. And then I add some features=
, some dirs, some files, do some modifications on the original files, and t=
hen&nbsp;<code style=3D"padding-top: 1px; padding-right: 5px; padding-botto=
m: 1px; padding-left: 5px; background-image: initial; background-attachment=
: initial; background-origin: initial; background-clip: initial; background=
-color: rgb(238, 238, 238); font-family: Consolas, Menlo, Monaco, 'Lucida C=
onsole', 'Liberation Mono', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono',=
 'Courier New', monospace, serif; ">add .</code>,&nbsp;<code style=3D"paddi=
ng-top: 1px; padding-right: 5px; padding-bottom: 1px; padding-left: 5px; ba=
ckground-image: initial; background-attachment: initial; background-origin:=
 initial; background-clip: initial; background-color: rgb(238, 238, 238); f=
ont-family: Consolas, Menlo, Monaco, 'Lucida Console', 'Liberation Mono', '=
DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, se=
rif; ">commit -am "blahblah"</code>&nbsp;and&nbsp;<code style=3D"padding-to=
p: 1px; padding-right: 5px; padding-bottom: 1px; padding-left: 5px; backgro=
und-image: initial; background-attachment: initial; background-origin: init=
ial; background-clip: initial; background-color: rgb(238, 238, 238); font-f=
amily: Consolas, Menlo, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaV=
u Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', monospace, serif; =
">push</code>. And then I can see my changes on the online repo, this is go=
od!</p><p style=3D"font-size: 14px; background-image: initial; background-a=
ttachment: initial; background-origin: initial; background-clip: initial; c=
lear: both; word-wrap: break-word; color: rgb(0, 0, 0); font-family: Arial,=
 'Liberation Sans', 'DejaVu Sans', sans-serif; text-align: left; ">But when=
 that company made some changes, I dont know them, they dont know me, so I =
guess I dont need "pull request", I just keep my development personal.</p><=
p style=3D"font-size: 14px; background-image: initial; background-attachmen=
t: initial; background-origin: initial; background-clip: initial; clear: bo=
th; word-wrap: break-word; color: rgb(0, 0, 0); font-family: Arial, 'Libera=
tion Sans', 'DejaVu Sans', sans-serif; text-align: left; ">So what should I=
 do when they made some changes? There are only a few, say 10 percents of f=
iles conflicts, mostly I want to keep my modifications, and others I just w=
ant to sync with theirs. What should I do. I want to keep my OpenXXX projec=
t updated but I dont want to lose any of my own developments!!</p><p style=
=3D"font-size: 14px; background-image: initial; background-attachment: init=
ial; background-origin: initial; background-clip: initial; clear: both; wor=
d-wrap: break-word; color: rgb(0, 0, 0); font-family: Arial, 'Liberation Sa=
ns', 'DejaVu Sans', sans-serif; text-align: left; ">Another question is: Is=
 it a good habit, I mean do I need to start a new branch, and once a week m=
erge it back to my own online repo's main branch, or what?</p><p style=3D"f=
ont-size: 14px; background-image: initial; background-attachment: initial; =
background-origin: initial; background-clip: initial; clear: both; word-wra=
p: break-word; color: rgb(0, 0, 0); font-family: Arial, 'Liberation Sans', =
'DejaVu Sans', sans-serif; text-align: left; ">And another question is, whe=
n that company's OpenXXX, has a new version, and that version has a differe=
nt git link address, OOPS, what should I do then? Does it mean that I need =
to create a new fork repo again, and manually find and export all my change=
s out and put them into the new forked repo??</p><p style=3D"font-size: 14p=
x; background-image: initial; background-attachment: initial; background-or=
igin: initial; background-clip: initial; clear: both; word-wrap: break-word=
; color: rgb(0, 0, 0); font-family: Arial, 'Liberation Sans', 'DejaVu Sans'=
, sans-serif; text-align: left; ">Any help would be much appreciated. Thank=
s</p><p style=3D"font-size: 14px; background-image: initial; background-att=
achment: initial; background-origin: initial; background-clip: initial; cle=
ar: both; word-wrap: break-word; color: rgb(0, 0, 0); font-family: Arial, '=
Liberation Sans', 'DejaVu Sans', sans-serif; text-align: left; ">(Could som=
eone share his workflow in case of my situation? I want to be both safe and=
 updated.)</p>
------=_Part_1725_23075373.1335473877860--

------=_Part_1724_19516728.1335473877860--