I am trying to pull the latest code pushed from another developer to the heroku deployed to my local system:
I executed following:
$ git pull heroku master failed
But I am getting the following error:
remote: Counting objects: 13, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 5), reused 1 (delta 0)
Unpacking objects: 100% (8/8), done.
From https://git.heroku.com/titan-demo
* branch master -> FETCH_HEAD
* [new branch] master -> heroku/master
Auto-merging db/schema.rb
CONFLICT (content): Merge conflict in db/schema.rb
Automatic merge failed; fix conflicts and then commit the result.
CONFLICT occurs in following file at that time the git could not auto merge the CONFLICT so you will remove the conflict in manually in this file db/schema.rb. the file conflict location is denoted as below syntax so you will remove unnecessary code and after you push the code.
// CONFLICT Example
<<<<<<<<<<<< HEAD *code from develop*
>>>>>>>>>>develop *code form your's*
Related
I want to install php#7.1 on my macbook pro with macos m1. I'm want to perform following steps
brew tap exolnet/homebrew-deprecated
brew install php#7.1
However, I get this error on command brew tap exolnet/homebrew-deprecated.
==> Tapping exolnet/deprecated
Cloning into '/opt/homebrew/Library/Taps/exolnet/homebrew-deprecated'...
remote: Enumerating objects: 98, done.
remote: Counting objects: 100% (3/3), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 98 (delta 0), reused 1 (delta 0), pack-reused 95
Receiving objects: 100% (98/98), 23.21 KiB | 127.00 KiB/s, done.
Resolving deltas: 100% (46/46), done.
Error: Invalid formula: /opt/homebrew/Library/Taps/exolnet/homebrew-deprecated/Formula/php#5.6.rb
php#5.6: Calling `sha256 "digest" => :tag` in a bottle block is disabled! Use `brew style --fix` on the formula to update the style or use `sha256 tag: "digest"` instead.
Please report this issue to the exolnet/deprecated tap (not Homebrew/brew or Homebrew/core), or even better, submit a PR to fix it:
/opt/homebrew/Library/Taps/exolnet/homebrew-deprecated/Formula/php#5.6.rb:10
Error: Invalid formula: /opt/homebrew/Library/Taps/exolnet/homebrew-deprecated/Formula/php#7.0.rb
php#7.0: Calling `sha256 "digest" => :tag` in a bottle block is disabled! Use `brew style --fix` on the formula to update the style or use `sha256 tag: "digest"` instead.
Please report this issue to the exolnet/deprecated tap (not Homebrew/brew or Homebrew/core), or even better, submit a PR to fix it:
/opt/homebrew/Library/Taps/exolnet/homebrew-deprecated/Formula/php#7.0.rb:10
Error: Invalid formula: /opt/homebrew/Library/Taps/exolnet/homebrew-deprecated/Formula/php#7.1.rb
php#7.1: Calling `sha256 "digest" => :tag` in a bottle block is disabled! Use `brew style --fix` on the formula to update the style or use `sha256 tag: "digest"` instead.
Please report this issue to the exolnet/deprecated tap (not Homebrew/brew or Homebrew/core), or even better, submit a PR to fix it:
/opt/homebrew/Library/Taps/exolnet/homebrew-deprecated/Formula/php#7.1.rb:10
Error: Cannot tap exolnet/deprecated: invalid syntax in tap!
Can anyone suggest me how to fix tihs, or how should I install php 7.1 on mac os m1?
Tap exolnet/homebrew-deprecated is no longer maintained, hence the error.
To install PHP 7.1, first, untap the exolnet/deprecated tap, then you can use the shivammathur/php tap that I maintain and is widely used.
Follow these steps.
HOMEBREW_DEVELOPER=1 brew untap exolnet/deprecated
Tap shivammathur/php
brew tap shivammathur/php
Install and link PHP 7.1
brew install shivammathur/php/php#7.1
brew link --force --overwrite shivammathur/php/php#7.1
Docs: https://github.com/shivammathur/homebrew-php
I do a tap and give me this error, I update brew and ruby and nothing.
Somebody can help me please?
> brew tap blackfireio/homebrew-blackfire
Updating Homebrew...
==> Auto-updated Homebrew!
Updated 1 tap (homebrew/cask).
==> Tapping blackfireio/blackfire
Cloning into '/usr/local/Homebrew/Library/Taps/blackfireio/homebrew-blackfire'...
remote: Enumerating objects: 23, done.
remote: Counting objects: 100% (23/23), done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 23 (delta 15), reused 4 (delta 0), pack-reused 0
Unpacking objects: 100% (23/23), done.
Error: Invalid formula: /usr/local/Homebrew/Library/Taps/blackfireio/homebrew-blackfire/Formula/blackfire-agent.rb
blackfire-agent: undefined method `prefer_64_bit?' for OS::Mac:Module
Error: Cannot tap blackfireio/blackfire: invalid syntax in tap!
I get the same error for a different formula https://github.com/GRASS-GIS/homebrew-grass-dev/issues/6 . I guess something it is a bug in home-brew as it is defined in homebrerw https://www.rubydoc.info/github/Homebrew/brew/OS%2FMac:prefer_64_bit%3F - just started the build again...
It was a bug in home-brew - working again
I am trying pod installation and pod setup in my new mac. But I got following issues on terminal. Anybody please could help me ?
$ /usr/bin/git clone https://github.com/CocoaPods/Specs.git master --progress
Cloning into 'master'...
remote: Counting objects: 2131130, done.
remote: Compressing objects: 100% (503/503), done.
error: RPC failed; curl 56 LibreSSL SSL_read: SSL_ERROR_SYSCALL, errno 54
fatal: The remote end hung up unexpectedly
fatal: early EOF
fatal: index-pack failed
There are two ways to do :-
1. It is related to your connections.If your connection isn't proper then you can get this error.So, whenever it happens you should again try to follow the same procedure of installation.
2. I dont think this is a cocoapods library issue.
Try to clone repo manually https://github.com/CocoaPods/Specs and then place it in ~/.cocoapods/repos/master
I:
-do some random changes
-git add them, commit and push
Then, the push goes somewhere like this
Counting objects: 13, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 825 bytes | 0 bytes/s, done.
Total 8 (delta 6), reused 0 (delta 0)
remote: : command not found
remote: An error occurred executing 'gear prereceive' (exit code: 127)
remote: Error message: CLIENT_ERROR: Failed to execute: 'control stop' for /var/lib/openshift/***/ruby
remote:
remote: For more details about the problem, try running the command again with the '--trace' option.
To ssh://***#treasurehunt-arakkun.rhcloud.com/~/git/treasurehunt.git/
! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'ssh://***#treasurehunt-arakkun.rhcloud.com/~/git/treasurehunt.git/'
I tried to stop, force-stop, start and restart the app, with those results:
Failed to execute: 'control stop' for /var/lib/openshift/***/ruby< though the app actually Stopped
RESULT:
treasurehunt force stopped
Failed to execute: 'control start' for /var/lib/openshift/***/ruby < though the app actually Started
RESULT:
treasurehunt restarted
Then I created a jenkins app, and added a Jenkins client to the main app.
I do the same(random changes, add, commit, push), then it answer:
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 351 bytes | 0 bytes/s, done.
Total 4 (delta 3), reused 0 (delta 0)
remote: Executing Jenkins build.
remote:
remote: You can track your build at https://jenkins-arakkun.rhcloud.com/job/treasurehunt-build
remote:
remote: Waiting for build to schedule........................................................................................................
remote: **BUILD FAILED/CANCELLED**
remote: Please see the Jenkins log for more details via 'rhc tail'
remote: !!!!!!!!
remote: Deployment Halted!
remote: If the build failed before the deploy step, your previous
remote: build is still running. Otherwise, your application may be
remote: partially deployed or inaccessible.
remote: Fix the build and try again.
remote: !!!!!!!!
remote: An error occurred executing 'gear postreceive' (exit code: 1)
remote: Error message: CLIENT_ERROR: Failed to execute: 'control post-receive' for /var/lib/openshift/55f02e560c1e66355f000028/jenkins-client
remote:
remote: For more details about the problem, try running the command again with the '--trace' option.
To ssh://***#treasurehunt-arakkun.rhcloud.com/~/git/treasurehunt.git/
8a2c901..3481731 master -> master
This is the Jenkins log
Started by user Jenkins System Builder
Building remotely on treasurehuntbldr (treasurehunt-build) in workspace /var/lib/openshift/560fd2162d5271d21d00002a/app-root/runtime/repo
Checkout:repo / /var/lib/openshift/560fd2162d5271d21d00002a/app-root/runtime/repo - hudson.remoting.Channel#11e523:treasurehuntbldr
Using strategy: Default
Last Built Revision: Revision 8a2c90189bf2c4418fca52c612463d9334b68a37 (origin/HEAD, origin/master)
Checkout:repo / /var/lib/openshift/560fd2162d5271d21d00002a/app-root/runtime/repo - hudson.remoting.LocalChannel#6c5712
Wiping out workspace first.
Cloning the remote Git repository
Cloning repository origin
Fetching upstream changes from ssh://55f02e560c1e66355f000028#treasurehunt-arakkun.rhcloud.com/~/git/treasurehunt.git
Seen branch in repository origin/HEAD
Seen branch in repository origin/master
Commencing build of Revision a64bb56a363ac16c041d9908091be57dc7583f31 (origin/HEAD, origin/master)
Checking out Revision a64bb56a363ac16c041d9908091be57dc7583f31 (origin/HEAD, origin/master)
Warning : There are multiple branch changesets here
[repo] $ /bin/sh -xe /tmp/hudson5827404008790235239.sh
+ source /usr/lib/openshift/cartridge_sdk/bash/sdk
++ '[' false == true ']'
++ OO_BASH_SDK=true
+ alias 'rsync=rsync --delete-after -azS -e '\''/usr/libexec/openshift/cartridges/jenkins/bin/git_ssh_wrapper.sh'\'''
+ upstream_ssh=***#treasurehunt-arakkun.rhcloud.com
+ rm -f /var/lib/openshift/560fd2162d5271d21d00002a//app-deployments/current/metadata.json
+ marker_present force_clean_build
+ '[' -f /var/lib/openshift/560fd2162d5271d21d00002a/app-root/runtime/repo//.openshift/markers/force_clean_build ']'
+ set +e
+ rsync --delete-after -azS -e /usr/libexec/openshift/cartridges/jenkins/bin/git_ssh_wrapper.sh '***#treasurehunt-arakkun.rhcloud.com:$OPENSHIFT_BUILD_DEPENDENCIES_DIR' /var/lib/openshift/560fd2162d5271d21d00002a/app-root/runtime/build-dependencies/
Warning: Permanently added 'treasurehunt-arakkun.rhcloud.com,172.16.4.63' (RSA) to the list of known hosts.
+ rsync --delete-after -azS -e /usr/libexec/openshift/cartridges/jenkins/bin/git_ssh_wrapper.sh '***#treasurehunt-arakkun.rhcloud.com:$OPENSHIFT_DEPENDENCIES_DIR' /var/lib/openshift/560fd2162d5271d21d00002a/app-root/runtime/dependencies/
Warning: Permanently added 'treasurehunt-arakkun.rhcloud.com,172.16.4.63' (RSA) to the list of known hosts.
+ set -e
+ gear build
Building git ref 'origin/HEAD', commit a64bb56
No such file or directory - /var/lib/openshift/560fd2162d5271d21d00002a/app-root/runtime/repo/.openshift/action_hooks/pre_build
Build step 'Execute shell' marked build as failure
Archiving artifacts
Finished: FAILURE
I tried adding the three/three.dart package from their Git repository to my project. I did that as mentioned here. But running pub get from the editor gives the following error:
Pub get failed, [1] Resolving dependencies... (0.1s)
Git error. Command: git fetch
fatal: Not a git repository (or any of the parent directories): .git
../../../../../../mnt/data/b/build/slave/dart-editor-linux-stable/build/dart/sdk/lib/_internal/pub/lib/src/git.dart 47 run.<fn>
dart:isolate _RawReceivePortImpl._handleMessage
This is an unexpected error. Please run
pub --trace 'get'
and include the results in a bug report on http://dartbug.com/new.
** Warning: Application may fail to run since packages did not get installed.Try running pub get again. **
Pub get failed, [1] Resolving dependencies... (0.1s)
Git error. Command: git fetch
fatal: Not a git repository (or any of the parent directories): .git
../../../../../../mnt/data/b/build/slave/dart-editor-linux-stable/build/dart/sdk/lib/_internal/pub/lib/src/git.dart 47 run.<fn>
dart:isolate _RawReceivePortImpl._handleMessage
This is an unexpected error. Please run
pub --trace 'get'
and include the results in a bug report on http://dartbug.com/new.
**
Warning: Application may fail to run since packages did not get installed.Try running pub get again. **
I do have git installed on my system. I run Ubuntu 14.04 if that's relevant.
Edit:
I tried pub --trace get and got this:
Resolving dependencies...
Git error. Command: git fetch
fatal: Not a git repository (or any of the parent directories): .git
This was followed by a long log message.
Here is pubspec.yaml file:
dependencies:
browser: any
three:
git:
url: 'git://github.com/threeDart/three.dart.git'
Got it to work finally. I specified the version along with the URL to the Git repo. Here is my final pubspec:
dependencies:
browser: any
three:
git: git://github.com/threeDart/three.dart.git
version: '>=0.2.5+1 <0.3.0'
I had to specify the version range for the package along with the link to the git repository.
dependencies:
browser: any
three:
git: git://github.com/threeDart/three.dart.git
version: '>=0.2.5+1 <0.3.0'