On Wednesday, February 5, 2014 9:59:30 AM UTC-5, Philipp Kraus wrote:
It is more a social problem and I don't want to fix encoding errors
manually.
Mostly user does not configurate their editors correct and I get after a
commit
encoding errors within the files, so I would like to convert
On Friday, December 27, 2013 9:03:31 AM UTC-5, Jagadeesh N. Malakannavar
wrote:
I have made some commits on rel-1. After some months I branched out rel-2.
How do I make sure that commits I made on rel-1 is in rel-2?
Just want to list out all missing commits on rel-2.
Just look at the git
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
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,
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
Make sure directory is *really* empty.
ls -al Spoon-Knife
--
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
On Monday, November 18, 2013 2:29:41 PM UTC-5, Greg Freeman wrote:
I have an issue with my workflow that I'm trying to resolve. I am a
developer as well as the project maintainer. We are using the forking
workflow so everyone has their own repo then I pull all their changes to my
copy to
On Wednesday, November 20, 2013 10:42:28 AM UTC-5, Greg Freeman wrote:
Huu you are correct. I left out something that is quite important. I am
using bitbucket/github depending on the project. This fork is through their
site. As far as I understand it, the benefit, besides easy pull requests,
On Wednesday, November 20, 2013 11:36:30 AM UTC-5, Huu Da Tran wrote:
Then, you put on the maintainer hat, and select the company account's
repo, approve/merge the pull request. This create a new branch. We use this
approach so developers can continue working on the feature
Git is a tool to keep track of evolution of a file.
What you need is more of a content management.
Git can be used to track versions of all the files, but you probably want to
have a website or other to actually tag (git tags goes on a specific state of
all files in the repo, not to confuse
You want to have all remote branches to be always sync'ed but not your local
branches? So basically, you want git fetch to update both clones?
I am not sure it makes sense speaking of current branch in two different repos
and keeping non-current branches sync'ed.
--
You received this message
If you really want to stay on the safe side, this would be the easiest and
safest for you.
git checkout branchX
git checkout -b branchX-merge-master
git merge master
fix any conflicts, do your tests. Commit conflict changes. When you are happy,
repeat
git merge master
Until everything is up
Instead of doing:
git pull remotename remotebranch
Try:
git fetch remotename remotebranch
git checkout remotename/remotebranch
git log conflictingfile
You will still need to rename the file prior to do this.
Hope this helps.
HD.
--
You received this message because you are
You could also look into solutions like bitbucket by creating repos and
assigning different access permissions.
Or on a unix server, achieve the same with different repos and unix user access
levels.
All this is defined at process level.
Hope that helps,
HD.
--
You received this message
I find this confusing on the dev level.
This can be developed in a different structure and then use an installation
procedure to layout the desired final structure.
This way, you can easily have them in separate repos and even have some way to
create dependencies, if any.
Take a system as an
Is the size of all directories a concern at all?
You clone it once and just leave it there and do normal git.
In other words, can you explain the problems you are trying to avoid?
I worked with big repos and cloning is slow, but then branching, commit and
push is fast, so maybe you are trying
I do not think it's possible to only clone a part of a repo. That being said, I
have not experimented with subtree nor submodule. Have you look into that yet?
Is there any way for you to access to repo from a remote host, but not mounted
nfs? Seems like a flaw in network design.
One hour is
On Saturday, August 17, 2013 2:50:50 PM UTC-4, pbr...@gmail.com wrote:
Aforementioned structure is forced by external runtime environment. No
possibilites for changes.
Projects are not compiled to libs etc.
I am sorry if my reply was not clearly expressed. It is not necessary to
compile
On Wednesday, July 31, 2013 6:53:58 PM UTC-4, python.b...@gmail.com wrote:
I synced to a repo tree which is branch jb... I have a local commit on
this branch which I am trying to push to a remote branch jb_mr2 and
running into following error..is there a git push command which I can use
to
On Wednesday, July 31, 2013 11:22:10 AM UTC-4, leam hall wrote:
I'm trying to design a workflow for our team and could use some advice. My
git-fu is young.
We have a remote repo that will store the authoritative code. That will
be pulled to a server local repo where the team has
There is a mention of a ebook now being free of charge. Admitting total
laziness, it would be great to have a link to the amazon store now free
ebook... unless I misunderstood.
Thanks.
--
On Friday, December 21, 2012 6:07:09 PM UTC-5, Aaron Woehler wrote:
I have two files in my repository that started showing up as single lines.
How do I fix this? The files show up fine in Eclipse and other editors.
Mixing unix and windows files?
Here is what git-gui shows me.
@@
Hi all,
I'm trying to exclude a new subdirectory that was added by someone else.
in my $GITDIR/info/sparse-checkout file, I have:
/web/
Now, I want to exclude the /web/tests/ subdirectory. So I changed my file
to:
/web/
!/web/tests/
but this does not work. After calling
git
On Monday, November 26, 2012 12:42:55 PM UTC-5, William Mizuta wrote:
Try to use git rm -r /web/tests to remove the directory from your git
project.
I want to keep it in the repo, but not in the sparse-checkout. Sorry if
that was not clear in my original question.
Thanks.
H.
--
24 matches
Mail list logo
