"Working with two local machines(separate locations) and one online gitbucket repository, whats the best why to lay this out etc."

[Simon Davies]

am currently working on a large laravel 4 project and i constantly work on
it at work and at home.

Currently I use dropbox to transfer the folder(zipped) between work and
home, then after unzipping i simply remove the old folder and replace it
with the latest.(Another reason to do this is if there was the odd chance
of something going wrong at the office and i have a spare up to date copy)

Now i have been looking on putting this onto Bitbucket as i know that other
will soon be getting involved or for the future and they have a good why to
keep track of issues etc that can be documented and all kept within
together.

Anyway, If i was simply just using the Work machine i could simple
push/commit all the days amends and that up to my bitbucket private account.

Now my thinking was that when i decide to work on the project at home
(normally 4 times a week etc) i could simply clone it then remove the last
local (Home)one and install the latest clone, then again after all has been
done for that day push / commit changes to my online BB account so that i
can then have the latest amends for me at work to then clone and overwrite
the local copy (work). And back and forth.

My question is that i'm kinda new to this git/gitbucket why of working and
would like some ideas on how i could perform this if my why above is a
total WTF.

How should i structure it, should i have a home branch, work branch etc or
just work on the master branch or should i just create one branch say
dev-version and then simply work on thi sat home and work then when happy
merge to the master online.

[Jacques Rioux]

Simon,

I think that Bitbucket is ideal for a scenario like yours but your planned
workflow is flawed.

You should stipulate that the gold version is always the one you have on
Bitbucket. Now you may want to enforce that only the default branch is ever
pushed to BB. Or you may want a branch per release or hotfix. I won't get
into that, let's just say that the simplest is the best initially until the
team sees.a need for more.

Now your and your coworker's workflow.sould.be.like this. Assuming you got
a version to start with in BB each contrbutor.starts by cloning the BB
repo. Each one makes changes locally and commits locally frequently.
Whenever something is completed and working with no obvious bugs, it is
time to push to the golden repo in BB. First you pull the changes that may
have appeared in BB while you worked on your feature. You merge.those
changes with your version and push to BB.

Locally you can create individual branches for features or bug fixes at
various versions but you do mot have to push those.

So in summary, it is

Changes
Commit
:
:
:
Changes
Commit
Pull
Merge
Push
Repeat...

Hope this may help a little.

Jacques


Sent with AquaMail for Android
http://www.aqua-mail.com

Post by Simon Davies
am currently working on a large laravel 4 project and i constantly work on
it at work and at home.
Currently I use dropbox to transfer the folder(zipped) between work and
home, then after unzipping i simply remove the old folder and replace it
with the latest.(Another reason to do this is if there was the odd chance
of something going wrong at the office and i have a spare up to date copy)
Now i have been looking on putting this onto Bitbucket as i know that other
will soon be getting involved or for the future and they have a good why to
keep track of issues etc that can be documented and all kept within together.
Anyway, If i was simply just using the Work machine i could simple
push/commit all the days amends and that up to my bitbucket private account.
Now my thinking was that when i decide to work on the project at home
(normally 4 times a week etc) i could simply clone it then remove the last
local (Home)one and install the latest clone, then again after all has been
done for that day push / commit changes to my online BB account so that i
can then have the latest amends for me at work to then clone and overwrite
the local copy (work). And back and forth.
My question is that i'm kinda new to this git/gitbucket why of working and
would like some ideas on how i could perform this if my why above is a
total WTF.
How should i structure it, should i have a home branch, work branch etc or
just work on the master branch or should i just create one branch say
dev-version and then simply work on thi sat home and work then when happy
merge to the master online.
--
This group is not monitored by Bitbucket Support. For support, go to
https://support.atlassian.com and register a FREE account. For even more
community support for Bitbucket, try Atlassian Answers, our Q&A site. It
can be found at https://answers.atlassian.com/tags/bitbucket/.
--- You received this message because you are subscribed to the Google
Groups "bitbucket-users" group.
To unsubscribe from this group and stop receiving emails from it, send an
For more options, visit https://groups.google.com/groups/opt_out.

[Hunter Mayer]

We've taken this a step further. Since I am building across multiple
platforms and making sure those work before pushing into the 'golden' repo
(on BitBucket) I just forked the golden repo (the golden fork?) and make
sure it all works across all the platforms using the fork before I do a
'pull request' back into the the golden repo since I manage both its matter
of me going in and merging in changes into the 'golden' repo. You could do
this with branching and only have one repo as it was mentioned, but
branching seems to really confuse some folks so I just do that on a local
level to try anything from simple tests to wilder build breaking ideas,
etc. with no FEAR. I really love that. Branching willy-nilly can be a mess
though. Ease into it. Definitely read up on it. This helped me a couple
years ago, I don't know how dated it is now. I still refer to it now and
again. http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/ Assuming
you are using mercurial, you did say git/bitbucket though... So that may
not be helpful after all although it does talk about their differences a
bit.

Before I understood branching I did a lot of forking. If you you are just
messing around I recommend it (I find tossing a fork is easier than
throwing a branch away.) But just likes lots of 'dead' branches laying
around, it becomes a personal management preference in the long run. I
probably should use branches more than I do though...

My bottom line advice echos Jacques. Use the online service first to move
about with. I only ever copy and move local repos in time of dire
necessity, archiving etc. Its just more that can go wrong. Embrace the
Commit, Pull, Merge, Push loop online. I think you will become happier and
more productive sooner if you give that go! (caveat: I am not saying there
isn't pain and price up front.)

-Hunter

Post by Jacques Rioux
Simon,
I think that Bitbucket is ideal for a scenario like yours but your planned
workflow is flawed.
You should stipulate that the gold version is always the one you have on
Bitbucket. Now you may want to enforce that only the default branch is ever
pushed to BB. Or you may want a branch per release or hotfix. I won't get
into that, let's just say that the simplest is the best initially until the
team sees.a need for more.
Now your and your coworker's workflow.sould.be.like this. Assuming you got
a version to start with in BB each contrbutor.starts by cloning the BB
repo. Each one makes changes locally and commits locally frequently.
Whenever something is completed and working with no obvious bugs, it is
time to push to the golden repo in BB. First you pull the changes that may
have appeared in BB while you worked on your feature. You merge.those
changes with your version and push to BB.
Locally you can create individual branches for features or bug fixes at
various versions but you do mot have to push those.
So in summary, it is
Changes
Commit
Changes
Commit
Pull
Merge
Push
Repeat...
Hope this may help a little.
Jacques
Sent with AquaMail for Android
http://www.aqua-mail.com
am currently working on a large laravel 4 project and i constantly work
on it at work and at home.
Currently I use dropbox to transfer the folder(zipped) between work and
home, then after unzipping i simply remove the old folder and replace it
with the latest.(Another reason to do this is if there was the odd chance
of something going wrong at the office and i have a spare up to date copy)
Now i have been looking on putting this onto Bitbucket as i know that
other will soon be getting involved or for the future and they have a good
why to keep track of issues etc that can be documented and all kept within
together.
Anyway, If i was simply just using the Work machine i could simple
push/commit all the days amends and that up to my bitbucket private account.
Now my thinking was that when i decide to work on the project at home
(normally 4 times a week etc) i could simply clone it then remove the last
local (Home)one and install the latest clone, then again after all has been
done for that day push / commit changes to my online BB account so that i
can then have the latest amends for me at work to then clone and overwrite
the local copy (work). And back and forth.
My question is that i'm kinda new to this git/gitbucket why of working and
would like some ideas on how i could perform this if my why above is a
total WTF.
How should i structure it, should i have a home branch, work branch etc or
just work on the master branch or should i just create one branch say
dev-version and then simply work on thi sat home and work then when happy
merge to the master online.
--
This group is not monitored by Bitbucket Support. For support, go to
https://support.atlassian.com and register a FREE account.
For even more community support for Bitbucket, try Atlassian Answers, our
Q&A site. It can be found at https://answers.atlassian.com/tags/bitbucket/
.
---
You received this message because you are subscribed to the Google Groups
"bitbucket-users" group.
To unsubscribe from this group and stop receiving emails from it, send an
For more options, visit https://groups.google.com/groups/opt_out.

[Jacques Rioux]

Oops, just want to add that all this I just posted applies the exact same
way for you at home and you at work.

Jacques


Sent with AquaMail for Android
http://www.aqua-mail.com

Post by Simon Davies
am currently working on a large laravel 4 project and i constantly work on
it at work and at home.
Currently I use dropbox to transfer the folder(zipped) between work and
home, then after unzipping i simply remove the old folder and replace it
with the latest.(Another reason to do this is if there was the odd chance
of something going wrong at the office and i have a spare up to date copy)
Now i have been looking on putting this onto Bitbucket as i know that other
will soon be getting involved or for the future and they have a good why to
keep track of issues etc that can be documented and all kept within together.
Anyway, If i was simply just using the Work machine i could simple
push/commit all the days amends and that up to my bitbucket private account.
Now my thinking was that when i decide to work on the project at home
(normally 4 times a week etc) i could simply clone it then remove the last
local (Home)one and install the latest clone, then again after all has been
done for that day push / commit changes to my online BB account so that i
can then have the latest amends for me at work to then clone and overwrite
the local copy (work). And back and forth.
My question is that i'm kinda new to this git/gitbucket why of working and
would like some ideas on how i could perform this if my why above is a
total WTF.
How should i structure it, should i have a home branch, work branch etc or
just work on the master branch or should i just create one branch say
dev-version and then simply work on thi sat home and work then when happy
merge to the master online.
--
This group is not monitored by Bitbucket Support. For support, go to
https://support.atlassian.com and register a FREE account. For even more
community support for Bitbucket, try Atlassian Answers, our Q&A site. It
can be found at https://answers.atlassian.com/tags/bitbucket/.
--- You received this message because you are subscribed to the Google
Groups "bitbucket-users" group.
To unsubscribe from this group and stop receiving emails from it, send an
For more options, visit https://groups.google.com/groups/opt_out.