Git Help

Hello,
How to share a project link on github.

OWASP: Threats Fundamentals

Learn the top ten threats that are present in modern web-application development and how to protect your business from them.

As will soon become clear, I'm not a master of Git or even Gitkraken. As such, I just have a hotfix, a master and a feature branch. I make changes in hotfix, commit, push, and merge into master (which I then also push). So far I've endeavored not to get more complicated than this.

Even my one feature branch is a bit cowardly, in that that I still keep my feature work separate (in separate files/directories) from my working files, and consistently merge master into the feature branch so I don't lose all the site's hotfixes – all so that my crucial site files are kept whole and untouched regardless of branch. I consider this an intermediate practice as I continue to maintain the site while getting my head around Git. Since now I'm having this bizarre issue, I can see why I hadn't taken that leap yet. Apparently I'm indeed not ready to power-use Git or Gitkraken.

This morning, I did some work on hotfix, and merged it into master. No issue. Then I tried to switch to the feature branch (which I hadn't been in for weeks as it has been all about hot fixes lately), and all hell broke loose. Gitkraken throws the error: "Checkout failed. Could not remove [swf file - one that was there long before my last commit] Operation not permitted." What? Web searches with these key phrases turned up literally nothing... making me the first person to have this happen, I guess.

Then!... immediately, still in hotfix and having done nothing further, suddenly there are 27 file changes staged …

4 Comments

What is GIT_WORK_TREE? Could it be writing over a file every time I push from my repo to my pro server?

Every time I do that, my robots.txt file gets written over. It get's written over with the contents of a file named robots.txt-live, which I have no idea why that even exists (Im new, taking over for a departed dev). I grepped the live server and found whats below... could this mean that whenever I push from my repo on GitHub, the contents of robots.txt at the destination are being replaced by the contents of robots.txt-live from the repo OR from the destination (that -live file lives there as well)?

./mysite.com.git/hooks/post-receive:8:cp $GIT_WORK_TREE/robots.txt-live $GIT_WORK_TREE/robots.txt

4 Comments

Hi,
I have made a local commit to the repo.
The remote branch is ahead by one commit. So I forgot to take the pull and commit my changes to local.
I did a git pull and git push
I saw the following 2 commits in the branch. The last one is weird.
whats the need for that to be created. how can i avoid that ?
So here my local branch was on 1f6a commit
and the origin was at 0ca commit

when i tried to push i got the error message :
On branch stage
Your branch and 'origin/stage' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)

after performing git pull i did git commit
and the top two commits were produced. Ideally only one commit should have
produced that of Remove nanosecond message.
How to avoid this top commit.

One way is to uncommit your latest change and then take a git pull
How to uncommit the lates change that is in local ?

This problem is mainly coming when i am committing something and the origin branch is
ahead of local branch.
The Merge branch 'stage' of 10.1.5.12:app-portal into stage commit
which was automatically created has this in it. It shows two parents !!

Thanks

1 Comment

I need whatever is in master branch to now be in my test branch named RM.

I definitely do not want to merge RM to master... I need it to be the other way around.

3 Comments

Hi,

I want to put a project I am writing on GitHub for public viewiewing.
What I want to make sure is no private information is in there.
I know my code does not have any references in there.

So things I am concerned about are.

My microsoft account email address
My azure devops Repos path - e.g. https://dev.azure.com/Code/Project/_git/xxxx etc
+ anything else I am not aware of.

I am assuming I would need to remove a git subdirectory somewhere.

Anything else - any other hidden files etc?

My original code is in Azure Devop's at the moment.
I am happy and prefer if I can not to have all the history there.

Which is why I was thinking of manually uploading it all.

Any thoughts / ideas.

Thanks,

Ward

1 Comment

Question by

RIAS

2019-01-13SolvedPrivate

Annotate(Blame) in github

Hi,
What is the meaning of Annotate (Blame) in GitHub
I am using visual studio 2017.

Thanks in advance.

3 Comments

Hi,
I am doing git rebase on a branch. There was some conflicts i resolved it and did git add
and then performed git rebase --continue
but got the same conflict again.
I tried this 2 times and still on the same conflict.

How to resolve this and what could be the reason for this ?
Here is the screenshot of the terminal :

Screen-Shot-2019-01-12-at-5.13.07-PM.png

Thanks

1 Comment

I am trying to get started with git pull.

I have a resource on the master branch at https://github.com/myname/TranTest

On my macbook I have a local directory called Trantest

What commands do i need to pull the file from my master branch to my local directory, and when I'm done commit the changes on my local file by sending the results to my master branch.

1 Comment

Is there any way or script to automate the deployment of a visual studio project then point the directory to the IIS server?

1 Comment

Exploring SharePoint 2016

LVL 13

Explore SharePoint 2016, the web-based, collaborative platform that integrates with Microsoft Office to provide intranets, secure document management, and collaboration so you can develop your online and offline capabilities.

Hi,
Whats the difference between git rebase master and git rebase origin/master ?
Thanks

1 Comment

Question by

RIAS

2018-12-13SolvedPrivate

Add project to Git

Hello,
How do I add my vb.net desktop project to git.
I am using visual studio 2017 .

Thanks

3 Comments

Hi,
I have seen two repo management tools that uses git.
One is phabricator and other is github
whats the difference between the two and what are the pros and cons of each
Which one to use when ?
Does one has some specific benefits over the other ?
Thanks

1 Comment

Because of our current network restrictions, I need to manually check if a local server's copy of a git repository is out of date with the remote repository. I tried to just use "git status", but it doesn't seem to fully check the remote repository. It keeps saying the local one is up-to-date, but when I do a "git pull", it definitely copies down updates. I need to do this inside a batch file on a Windows Server 2012 server. Are there any quick options for this?

Thanks!

2 Comments

LVL 1

Question by

Bobby

2018-11-09Solved

GitHub vs self-hosted Git

We currently host Git on our sandbox server where we (2, sometimes 3 people if we hire a temp contractor) collaborate on the code for our website. I'm new in this position of backend web dev, inheriting the position from our long time backend dev who moved on. I *was* the head IT guy but now I'm trying to figure all this out as part of my new job.

Is there a benefit to using GitHub as opposed to just having Git installed on our sandbox server?

2 Comments

My computer operating system is Windows 7 pro .

I am trying unsuccessfully to find code in Github. I need help using the search feature. Yes, I have searched Experts-Exchange first before posting this message. I guess I just don’t know what key words to enter.

I have to write a program to switch last name, first name to first name, last name. I am not a coding expert. I was hoping to find some vbscript code which would perform the task. I have to deal with all kinds of names. In the data I have to convert there are names with 3 elements like:

Joe Jones Hopkins

Then there are people who have just one name.
And there are people with suffixes like Jr and III . Example Joe Jones jr. etc.

Please explain in detail how you would use Github search to find suitable code to do the above. I would prefer vbscript but Python code would be suitable also.

Or may be there is an Experts-Exchange article which would help.

Thank you for your help.

7 Comments

I updated the patches on a Ubuntu box running gitlab-ce. Now it's refusing to start with the following error in unicorn_stderr.log

F, [2018-10-12T21:47:15.632756 #3235] FATAL -- : error adding listener addr=127.0.0.1:8080
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/socket_helper.rb:185:in `bind': Cannot assign requested address - bind(2) for 127.0.0.1:8080 (Errno::EADDRNOTAVAIL)
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/socket_helper.rb:185:in `new_tcp_server'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/socket_helper.rb:165:in `bind_listen'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/http_server.rb:242:in `listen'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/http_server.rb:813:in `block in bind_new_listeners!'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/http_server.rb:813:in `each'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/http_server.rb:813:in `bind_new_listeners!'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/lib/unicorn/http_server.rb:138:in `start'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/unicorn-4.9.0/bin/unicorn:126:in `<top (required)>'
      from /opt/gitlab/embedded/service/gem/ruby/2.1.0/bin/unicorn:23:in `load'
      from …

3 Comments

Please provide reference(s) that git doesn't require system administration.

Earlier today I asked question is there a version control system that doesn't require system administration.
Expert answered Git.

I could google this information. Please provide some links that confirm that git doesn't need system administration.

2 Comments

Hello Experts,
I need to add a Java Eclipse Project into BitBucket which will be cloned and used by the team. While I do have the experience of creating a GIT repository to maintain some XML files, I was wondering what care needs to be taken while adding an entire project (like the files that needs to be ignored, etc). Also, I would be interested to know if there is a way to internally link a JAR file of this Java project into the folder of another project in the same repository.

3 Comments

Angular Fundamentals

LVL 13

Learn the fundamentals of Angular 2, a JavaScript framework for developing dynamic single page applications.

How can I edit two or three files in Github Enterprise and put them all into one pull request?

3 Comments

Does anybody know how to solve this Git Issue?

I'm using Vs 2017 under windows 10, thank you.

The problem is that I've changed the username in the Bitbucket now I don't know how to tell that to vs.
Thank you in Advance

7 Comments

I have a bit of a different type of question. I'm trying to find a graphic or come up with a graphic that represents the benefits of version control.

Initially, I was just thinking of putting a company logo and version control logo and then a cloud platform logo on a page with connectors, but that doesn't really capture the benefits of version control.

When I think of benefits, I think of speed, backup, recovery, ease of deployment, etc.

So, I was trying to find a graphical representation of those types of benefits when using version. I thought someone on here might know of a graphic that already exists or might throw out some suggestions.

Thanks.

2 Comments

I am trying to install mod_security on an Amazon Linux 2 running Apache 2.4

This is the guide I am following -

https://resources.infosecinstitute.com/configuring-modsecurity-firewall-owasp-rules/

Open in new window

It fails on this command -

git clone https://github.com/SpiderLabs/owasp-modsecurity-crs.git

Open in new window

I get this output when I try to run it from root -

git clone https://github.com/SpiderLabs/owasp-modsecurity-crs.git
Cloning into 'owasp-modsecurity-crs'...
fatal: unable to access 'https://github.com/SpiderLabs/owasp-modsecurity-crs.git/': error setting certificate verify locations:
  CAfile: /etc/pki/tls/certs/ca-bundle.crt
  CApath: none

Open in new window

Please help me to get Mod_Security installed and running

Thanks,

4 Comments

I have a git ignore file, which ignores all the dll. In a ASP.NET application using visual studio 2017, default template creates a package folder and any nuget downloads are downloaded there. if this folder is not checked into a source control.

How do I configure build server like jenkins/bamboo. so that when I build a project , the required dlls get downloaded?

4 Comments

LVL 1

Question by

tf2012

2018-06-28SolvedPrivate

Git Repo license question

I'd like to use a project I see in a git repo as the foundation for part of a commercial project. I don't see any license info in the repo and obviously I won't proceed without some explicit license or agreement. However, at first glance can someone tell me if you notice any license terms that I'm not seeing?

I can write my own version to get started using this as a reference but it would be nice to skip that step and build my product on this starter code. How would you handle this?

https://github.com/fanout/todomvc-liveresource-react

Thanks

1 Comment

Git

Related Topics

Git

Related Topics