anks again for the help,
Amin
On Wednesday, July 5, 2017 at 6:03:49 PM UTC-4, Alexandru Pătrănescu wrote:
>
> Hi Amin,
>
> You an try using a patch: git format-patch and git am.
>
> While you're trying to fix it, you might want to think about creating a
> unidirectional flow strateg
repository doesn't share any history with the original one, so I can't
just do normal rebasing or merging.
I'd appreciate any help with my question.
Thanks,
Amin
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubs
Hi,
On Friday, March 8, 2013 4:06:04 PM UTC-5, Piers H wrote:
why does git require all these gymnastics just to do a simple merge?
with SVN it was 1 command, and I never had any issues with it. i don't
understand.
You'll need to adjust your workflow a little bit. Git has a different
Hi,
On Wednesday, May 22, 2013 3:02:50 PM UTC-4, Roddie wrote:
[...]
That work is on hold because I have to get adverts on the home page, and
I've made a new branch - adverts. This was branched from the master
branch, so does not include any of the work on memlogin. But I need
the
Hi,
On Tuesday, May 21, 2013 6:39:30 PM UTC-4, Tony Quilkey wrote:
[...]
1) Create topic (feature) branches from develop, and merge back into
develop when complete.
Sounds fine.
2) Once it is decided we are packaging a release, make a release-*
branch from the previous release tag.
Hi Philip,
On Thursday, May 16, 2013 6:42:03 PM UTC-4, Philip Oakley wrote:
Recently there have been a couple of example commands that have a single
dot '.' in the command line.
In this case what is its proper meaning, that is, is it expanded by the
bash shell, or by git it self, and
Hi,
On 2013-05-24 09:33, Bruno Cassol wrote:
Hi,
we have the following setup and I would like advice/help. I'm not even sure
if this the correct setup.
DEVELOPERS WORKSTATIONS (Windows/TortoiseGit)
c:\xamp\htdocs\intranet/
|
| push / pull
V
DEV (CentOS/ssh)
/home/git/repos/intranet/
On 2013-05-25 07:55, Philip Oakley wrote:
[...]
Plus the '.' represents 'the thing you are working on / thinking
about', so if the parameter is meant to be a remote repo, then it's
the current repo. If its a file path parameter then its the current
directory.
I'm not sure if there are any
On 2013-05-31, at 2:32, Paul Smith p...@mad-scientist.net wrote:
[...]
I DO want to do the cleanup before merging to master. If you mean do
the cleanup before pushing to the git repo, I can't do it all because
it's not until after I push that I can detect build issues on platforms
I don't
Hi David,
On 2013-06-13 14:12, David Gudeman wrote:
[...]
don't think); I'm confused about what the point is. As far as I can
tell, rebase is just the same as doing a merge and then throwing away
some history. Why throw away the history? All of the documentation I
That's not what rebase is.
Hi,
On 2013-08-15, at 14:03, Marco Grubert grube...@gmail.com wrote:
I have heard conflicting statements about the impact of branching in git.
Let's say we have 100 feature branches that are all stored in a remote repo,
would that affect performance (CPU/network) in a noticeable way ? How
11 matches
Mail list logo
