Questions tagged [branch]

1

votes
2

answer
177

Views

Failed cordova android build with not find symbols on windows

My Android build is getting failed when I am running cordova build command. I am not able to succesfully build app for android; gradlew: 4.1 java: 10.0.01 android studio: 3.1.2 Excerpt console dump. More on https://pastebin.com/uZriaq1u :app:compileArm64DebugJavaWithJavacD:\Projects\ZwyczajnyPL\cor...
Michał Mazur
1

votes
0

answer
19

Views

gitlab 2 month old branch on remote

Today I pulled 2-month-old branch for some work using the following commands git fetch origin git checkout -b feature/ origin/feature/ now if I run git status I get over 100 files are untracked what is the reason for this ? and now I have to delete this branch I cannot go to another branch to delete...
lila
1

votes
1

answer
15

Views

How to remove file from git repository but only up to a certain point in history?

I know how to use filter-branch to completely leave a file out of the repository history. What happened is that I had slightly sensitive information in a file some commits ago, but I have removed it and I want to keep the file from that safe commit onwards. Can I do it? Or will I have to to do some...
Paulo Soares
0

votes
0

answer
7

Views

Time Complexity of Travelling Salesman Problem

What is the time complexity of the TSP problem using branch and bound. Is it the same as Dynamic Programming which is O(2^n * n^2)
Stone cold Cold
1

votes
0

answer
10

Views

Depend on workspace package from a branch in a package.json?

Let's say in my package.json I depend on a next branch by declaring in my dependencies: react-admin': 'marmelab/react-admin#next' That repository has workspaces (local packages so to say). For example: ra-ui-materialui What do I add to dependencies of my package.json to depend on ra-ui-materialui i...
0

votes
2

answer
43

Views

Why when I make a change in 'X' branch my master branch is changing as well in the same way?

I have a master branch: Then I make employee branch from the master and change it a bit: And when I swipe between branches, the master branch also had been changed: I have no clue why it happens. Any suggestions how to return it back to norm?
Virtual Device
1

votes
1

answer
167

Views

Multiple application android:name tags in Unity android manifest

I want to use Branch.io and Soomla plugin in an Unity project and both plugins need to modify android:name in Unity android manifest: ... ... I know we can't put multiple android:name in application tag, Is there any way to handle it?
1

votes
1

answer
78

Views

Branch.IO showShareSheet not generateting ShortUrl

I recently implemented the Branch.IO framework in iOS project. Everything is working but while calling 'showShareSheet(with: blp, andShareText: shareTxt + '\n\n', from: vc, completionWithError: callback)' its opening the Ios Share Sheet option, while selecting installed shareable app, branch method...
Anand3777
1

votes
1

answer
14

Views

I forked someone's forked repo. How can I change my repo to go to the original repo?

This is what the current situation is... Repo C is a fork of Repo B Repo B is a fork of Repo A Inside Repo C, I worked on a branch that only exists in Repo B. How can I change github so that Repo C is only a fork of Repo A?
john zhang
1

votes
1

answer
153

Views

develop and master branches not visible remotely on VSTS

The first picture displays that I have only one feature branch on VSTS: The second picture displays that I have develop and master branches as well in visual studio locally: There were master and develop branches on remote before, but seems to disappear suddenly. My commit history does not show any...
Azmeena
1

votes
1

answer
162

Views

How to create custom Grouping convention for Git Branch?

We recently moved from Perforce to Git and for technical reasons are have to stick with our old naming conventions for branches, which is: For Features: feature_abcd_123 For Bugfixes: bugfix_xyz_6789 For Custom: custom_mnop_8965 It is very difficult (next to impossible) for us to adopt Git’s branc...
ikis
1

votes
5

answer
172

Views

Collecting a list of all branches in a repository in a special format [Git]

Is there a way to collect a list of the branch in a repository and there last commit date? In other words, I would like to print something like this to the stdout: branch_name_1 date1 branch_name_2 date2 branch_name_3 date3 Is it possible? EDIT: I tried to use the following steps: git log --pretty=f...
TTaJTa4
1

votes
1

answer
59

Views

Switching between branches in git

i have the following question. Im using git to keep track of various python scripts for data evaluation. I have one set of scripts for the standard tasks and a branch of these scripts for one special task. So if im just changing little things (like input filenames) in the one branch and want to do s...
Iffuw
1

votes
0

answer
29

Views

Git - creating submodule into specific branch

I want to create submodule only into specific branch, but not for all branchech. Here is an example. I have two branches: dev, and master, and I want to have submodules only in dev branch, but not in master. Sample file structure ` base-project | |-projectA | |- file.txt | |-projectB | |-file.txt `...
riverside256
1

votes
0

answer
25

Views

Git branch switch automatically issue

I have came across this strange behaviour my git branch changes automatically to a local branch.. see below when i do git status i see it has moved back to local-v2.0. What is the reason--- C:\BBB-FEO\GIT_REPO\ecom-appconfigsvc>git status On branch dev02-v2.0 Your branch is up to date with 'origin/d...
user1643003
1

votes
0

answer
88

Views

Bitbucket tries to merge Master into Develop when I make pull request from feature branch into Master

I wanted a quick fix in Master branch and I made feature branch about it. I made pull request from the feature branch to Master and when I tried to merge it Bitbucket automatically wants to merge Master branch into Develop showing me this image: And when I click merge it really tries to merge them (...
1

votes
0

answer
146

Views

Branch.io INSTALL, OPEN standard events and custom events are not logging

We are implementing deep-linking for an Android application(multi-flavor) according to branch documentation described here https://docs.branch.io/pages/apps/android/. After integration tested with IntegrationValidator.validate(this), it passed. We have tested the following scenarios: 1. Shared deep...
Bhagya
1

votes
1

answer
15

Views

Perforce replication

I have a test server of perforce on which I want to have all the files which are on another perforce server. Along with files I want all other information such as versions, changelists, and every other information. In exact terms, I want my new server to be a replica of my old server. Please mention...
Praveen Meesala
1

votes
1

answer
209

Views

Checking if a Git Branch Exists in Batch

I am trying to determine if a git branch exists in a specific location using batch through Jenkins. From what I understand, Jenkins runs the commands similar to how a Batch shell script would run. After researching this question on Stack Overflow already (and finding several pages about this similar...
quango
1

votes
1

answer
50

Views

`git checkout commit_id` still works after `git gc`

I have a commit that should have been left dangling/unreachable after a rebase on branch it was attached to was executed, and the commit was squashed in the process. git rebase -i Now, if i do git branch --contains ID i get nothing. So then i do a git gc --prune=now --aggressive. Now i assume that...
omu_negru
1

votes
1

answer
152

Views

GA tracking with additional URL parameters

Something I cannot find information about in the GA tracking documentation of branch.io is how to attach parameters other than the default GA ones to a link? For example on top of UTM tracking our company uses custom URL parameters like ?acc=amex in order to provide special access pages on web that...
Florian Monfort
1

votes
1

answer
30

Views

No commits available for merging in the Git request

I merged a branch, lets say developer in to another branch lets say main. Then I realized that the changes from developer were not meant to be available in main. I used the remove branch option that created a merge request excluding my changes from main branch. I merged this request and the main bra...
Saurabh Tiwari
1

votes
1

answer
27

Views

git push complete and separate branch to remote repository

I have a Git Server... My Partner created a new branch.... cd C:\profaNew\ProjectosJava git checkout -b diana git branch git add . git commit -m 'Nuevo Proyecto Base' git remote add origin [email protected]:/srv/git/project.git git push -u origin diana Now in my machine, I hope view her branch, But...
QA_Col
1

votes
0

answer
72

Views

Hundreds of unwanted remote branches in git branch output. Why?

I simply cloned a repo, then performed git fetch. I haven't created any branches, nothing is tracked. When I type 'git branch' it shows (besides 'master') a hundreds of remote branches in the form: /Dev/Project/. The heads subdirectory is empty. I always thought that git branch shows only local bran...
ardabro
1

votes
1

answer
50

Views

How can I convert this git filter-branch command from tree-filter to index-filter?

I am merging several repositories into a single repository, and we would like to keep history and some (shared) branches. There are going to be filename conflicts, so I am moving the contents of each individual repository into a subdirectory in the combined repository. I've tried a bunch of differen...
jmilloy
1

votes
1

answer
42

Views

Remove commit on now deleted files

I have clean my repository using git filter-branch to remove some folders using the following command: git filter-branch --force --index-filter 'git rm -r --cached --ignore-unmatch folder' \ --prune-empty --tag-name-filter cat -- --all After this, I still have some commits that are only relevant fo...
Holt
-1

votes
2

answer
9

Views

How can multiple developers work on the same feature (branch)?

Developer A is working on a feature in his local repository. Developer A is unfinished with his work, however he needs to transfer his work to Developer B so Developer B may continue the feature in his own local repository and later push to master. Working with Git in Microsoft Visual Studio, is the...
Alex
1

votes
1

answer
37

Views

Why is there a popup alert for iOS DeepView attempting to find the URI

For a user who clicks on a Branch link and who has not installed my app, a popup alert displays saying it can't find the iOS URI I specified in the iOS URI Scheme. The URI scheme is only for users who have already downloaded the app and the popup alert is bizarre (nobody understands what my-app-u...
efwjames
1

votes
1

answer
44

Views

Nginx domain resolving issue

I had a proxy server which redirects communications to some api on customer side via https. When I use configuration with set upstream variable (proxy_pass $upstream_endpoint$request_uri;), the DNS resolving for this domain (dynamic changing IP adress) is working well but I get response 403 unauthor...
PeterH
1

votes
1

answer
22

Views

Sendgrid integration: How to host AASA file on same domain as CNAME redirect

How can I host the AASA file on the same domain where the CNAME redirects to thirdparty.bnc.lt ? Trying to download the AASA will just always redirect to thirdparty.bnc.lt, won't it? Here's where I'm stuck: 1. Begin setup of Sendgrid email integration 2. Step 2 (Configure ESP): put in the correct in...
user1366911
1

votes
1

answer
108

Views

Has Python got branch prediction?

I implemented a physics simulation in Python (most of the heavy lifting is done in numerical libraries anyways, thus performance is good enough). Now that the project has grown a bit, I added extra functionality via parameters that do not change during the simulation. With that comes the necessity t...
japs
1

votes
1

answer
42

Views

Recover files after a reset hard from another branch

It's a common question here and I hope you can help me also. I didn't stash anything and no commit at all. I naively 'ran' a tool that did the following to my GitHub: git branch -f another-branch git checkout another-branch git reset --hard origin/my-work git add -A . git commit -a -m 'magical updat...
1

votes
2

answer
107

Views

How to make sure to avoid branch misprediction when calling a method using one of two methods based on a boolean

Let's say you have a call to a method that calculates a value and returns it : double calculate(const double& someArg); You implement another calculate method that has the same profile as the first one, but works differently : double calculate2(const double& someArg); You want to be able to switch f...
Norgannon
1

votes
3

answer
23

Views

Get full commit history from a remote branch to a local orphan branch

I recently wanted to cloned a large repository so, I ended up cloning a single branch. git clone --single-branch dev [email protected]:xyz/abc.git This repo has few other branched namely stage & master. Now my local clone has only the dev branch. My Question: How do I now checkout to the stage branch ?...
naxrohan
1

votes
0

answer
55

Views

Android Deep Link Using Branch SDK

I am using branch sdk for integrating the deep linking in my Android App. If the app is installed on device, it will redirect to an app along with parameter(Deep Link Data). If the app is not installed on device, it will redirect to the Playstore page correctly. But after install the app and open it...
Spaculus Infotech
1

votes
0

answer
6

Views

Retaining Original Folder with GIT subdirectory-filter

I have the following folder structure: Folder1 -> SubDirectory1 -> File1 -> File2 -> SubDirectory2 I need to filter the structure so that only SubDirectory1 and its contents are left. I'm using: git filter-branch -f --subdirectory-filter 'Folder1/SubDirectory1' --prune-empty --tag-name-filter cat --...
Chris
1

votes
1

answer
39

Views

Add note to commit when filtering branch with Git

Next command is to store commit history and files lists but remove file contents in order to minimalize disk space and network traffic consumption when need to get know history of huge repo without fetching large objects. This allows to save much time. git filter-branch -f -d `mktemp -d` \ --tree-f...
kyb
1

votes
1

answer
38

Views

Correct way to update git superproject

Scenario: We have recently started using a superproject in our team but seem to keep ending up having different versions of our superproject. We are all working on 1 branch of the project (but superproject has 3 remote branches). The issue seems to be that some files which have been deleted in the r...
j1849277
1

votes
0

answer
17

Views

How can I merge cleanly & easily between related git repositories?

We have two related git repositories: The main repository and the external repository. The main repository is used within my company and contains everything. The external repository is shared with select external parties. It has some sensitive directories excluded and slight differences in the bui...
Tolli
1

votes
1

answer
20

Views

How can I restrict branch acces to specific users of Git on centos 7 server?

I successfully configured centos 7 machine as git server. Now, I have a requirement where I want to keep some documents on a branch(say some admin branch) which should be accessible to few of my teammates and not for other teammates. How can I achieve that. Thanks in advance.
Parashuram

View additional questions