Git

130

Solutions

182

Contributors

Git is a version control system for software development. It is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed for Linux kernel development. As with most other distributed version control systems, every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server.

Share tech news, updates, or what's on your mind.

Sign up to Post

Hi Experts,

I am new to Git and we use Bitbucket as a our Repo. I have a scenario based.

1) I have already taken a project i.e. Branch from Bitbucket and worked on it, for example
         
       
/c/Source/projectname (epic/xxx-119)

Open in new window


2) This Branch has now been pushed back to bitbucket and worked on by another developer

3) Meanwhile I continued working on specific files on my local copy or Branch while the other developer had been working on my pushed up branch

4) Developer has now finished and I need to pull down his work and merge with mine

what is the safest way to achieve step 4 without over writing those specific files?

Is it as easy as git bash from here---
==> c/Source/projectname (epic/xxx-119)

$ git checkout -b <branch name>
$ git pull origin <branch name>
$ git reset --hard origin/release/core


I feel this will overwrite my project.

alternatively... is it advisable to pull down the new branch onto a separate location on my drive and copy and paste only the files I need into my working folder

Kind Regards

Mike
0
Free Tool: ZipGrep
LVL 9
Free Tool: ZipGrep

ZipGrep is a utility that can list and search zip (.war, .ear, .jar, etc) archives for text patterns, without the need to extract the archive's contents.

One of a set of tools we're offering as a way to say thank you for being a part of the community.

Hello

Let's say i narrow the language in github search. I further want to specify a string to search for in all the repos available. Possible? How?

thanks
0
can we  run a script automatically when a developer commits a change into GIT
best way to run this script. kindly help.
0
I want to know how to edit a comment in git after commit has been pushed , the exact commit number is available with me, I am using "ubuntu 16.04"   and git version is "GitLab Community Edition 8.14.0"
There are few more users who have done a commit after me on the same project.
I do not want other commit messages to be altered.
0
I am planning to storing large video files on GitHub and is looking for guidance on how to optimize the user experience for downloading these large files off GitHub.

Is there any way to make the files smaller on the upload, cloning the repo, or if there was another platform/service we could consider ?

Thanks,
0
I have been trying to install GIT 2.8.1 on my AIX server running 7100-03-04-1441, and receiving following error:

# rpm -ihv git-2.8.1-1.aix6.1.ppc.rpm
error: failed dependencies:
        libcrypto.a(libcrypto.so) is needed by git-2.8.1-1
        libssl.a(libssl.so) is needed by git-2.8.1-1

I have verified that both of these files are on the system in /opt/freeware/lib.
 Per my  research findings, I ran the updtvpkg command, and also  exported my  LIBPATH to include /usr/lib/ and /opt/freeware/lib. Also tried the -nodep option, which allowed git to be installed, but then receive the message:
Could not load program git:
        Dependent module /usr/lib/libcrypto.a(libcrypto.so) could not be loaded.
        Member libcrypto.so is not found in archive

Any ideas would be greatly appreciated!
0
I have an android app that I developed with eclipse and git (bitbucket).
Using eclipse and git, I've committed and push changes to my bitbucket respository.
I've moved the app to Android Studio.
I tried putting the Studio version of the app under git control, but something is amiss.

From what I read online, all I needed to do was copy the .git directory from the eclipse project
directory to the android project directory. I've done the copy but now when I do a 'git status'
in the android directory git wants to delete a bunch of files, including the .java files.

I also put a .gitignore file in the top directory of the android studio project, but git doesn't appear
to be reading this file.

How can I get the android studio project git to correctly understand that the project is under git and the local
files should not be deleted ? How can I get .gitignore file to be honored ?

Any help with fixing these two problems would be greatly appreciated.
0
I'm having an issue upon merging to master in git.
A file that I was working on in my local branch (old.file) has been moved and renamed in master (to new.file).
After merging master into my branch I now have the new file and working changes on the old file.

How do I move changed contents of old.file into new.file?
I only want to move the 20-something changed lines of old.file into new.file and then delete old.file.
0
I have a website that I need to commit system generated files and folders to an existing git repository via linux command line. I've pulled the repo to my server, and am writing files within a sub folder of the repo, but when I run 'git add [FOLDER]/*' , its giving me an error that the folder is outside the repository. I'm at a loss as to how to get past this. I'm brand new to git, please help!
0
This is Chef cookbook question.

Question: I need to dynamically reference an index.html file located on github.com within the recipe.

Apache2:

template '/var/www/html/index.html' do
   source index.html.erb
end

In the above code, /var/www/html/index.html file is being replaced with index.html.erb located in <cookbook>/template/default/index.html.erb file. What I want is instead of index.html.erb, I need to use https://github.com/<repository>/myIndex.html

If there is any change in myIndex.html, it should reflect in /var/www/html/index.html realtime.

I appreciate your help.
0
Hi Expert,

I just got installed Git on my server  running on CentOS 6.7. However, I can't access to my repository via public key, actually my laptop can access my server using ssh key which I already added to server, I would like to know is there any configuration I should take on my linux server in order to get access to my repository?

Thanks
0

Git

130

Solutions

182

Contributors

Git is a version control system for software development. It is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed for Linux kernel development. As with most other distributed version control systems, every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server.

Top Experts In
Git
<
Monthly
>